Don't initialize the terminal twice.

diff --git a/debian/changelog b/debian/changelog
index e80f2debba66a5d1e55a2e81daa2ecdc8f7f0d25..2b1c24bb80caf1108289edfb90a349a4db6d51bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+emacs23 (23.2+1-7) unstable; urgency=low
+
+  * Don't initialize the terminal twice.  Previously a console-mode
+    Emacs would send the escape sequence to switch to the alternate
+    screen twice. At a minimum, this caused problems with screen.
+    Thanks to Courtney Bane <debian-bugs-5265@cbane.org> for the
+    report and the patch. (closes: #599463)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 11 Dec 2010 10:38:51 -0600
+
 emacs23 (23.2+1-6) unstable; urgency=low
 
   * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since

diff --git a/debian/patches/do-not-initialize-terminal-twice.diff b/debian/patches/do-not-initialize-terminal-twice.diff
new file mode 100644 (file)
index 0000000..686cca3
--- /dev/null
+++ b/debian/patches/do-not-initialize-terminal-twice.diff
@@ -0,0 +1,37 @@
+* The terminal should no longer be initialized twice.
+  Patch: do-not-initialize-terminal-twice.diff
+  Provided-by: Courtney Bane <debian-bugs-5265@cbane.org>
+  Date: Thu, 07 Oct 2010 12:58:15 -0500
+  Added-by: Rob Browning <rlb@defaultvalue.org>
+  Status: incorporated upstream
+
+  The Debian patch is taken from this upstream commit:
+
+  revno: 100029
+  author: Anonymous <emacs-bugs-7626@cbane.org>
+  committer: Stefan Monnier <monnier@iro.umontreal.ca>
+  branch nick: emacs-23
+  timestamp: Sat 2010-09-11 14:53:21 +0200
+  message:
+    * src/term.c (tty_set_terminal_modes): Don't initialize twice (bug#7002).
+
+--- a/src/ChangeLog
++++ b/src/ChangeLog
+@@ -1,3 +1,7 @@
++2010-09-11  Anonymous  <emacs-bugs-7626@cbane.org>  (tiny change)
++
++      * term.c (tty_set_terminal_modes): Don't initialize twice (bug#7002).
++
+ 2010-08-17  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
+--- a/src/term.c
++++ b/src/term.c
+@@ -250,7 +250,6 @@
+             cmputc ('\n');
+         }
+ 
+-      OUTPUT_IF (tty, tty->TS_termcap_modes);
+       OUTPUT_IF (tty, visible_cursor ? tty->TS_cursor_visible : tty->TS_cursor_normal);
+       OUTPUT_IF (tty, tty->TS_keypad_mode);
+       losecursor (tty);

diff --git a/debian/patches/series b/debian/patches/series
index f29aaa58457fe6c075e33655012c7aff90e9546b..054b55a530b546875f69bc6b5b1dfd40371a189f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ prevent-let-eval-apply-stack-overflow.diff
 use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff
 fix-gnus-output-to-mail-with-live-rmail-buffers.diff
 fix-fc-dual-font-width-calculation.diff
+do-not-initialize-terminal-twice.diff